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

Merge branch 'main' into disclosable-component

Browse source
This commit is contained in:
Mikayla 2023-08-23 16:30:27 -07:00
commit 707ca34f19
No known key found for this signature in database
139 changed files with 13495 additions and 1061 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -482,7 +482,7 @@ impl Item for ProjectSearchView {
.update(cx, |editor, cx| editor.deactivated(cx));
}
fn tab_content<T: View>(
fn tab_content<T: 'static>(
&self,
_detail: Option<usize>,
tab_theme: &theme::Tab,
@ -499,10 +499,14 @@ impl Item for ProjectSearchView {
.with_margin_right(tab_theme.spacing),
)
.with_child({
let tab_name: Option<Cow<_>> =
self.model.read(cx).active_query.as_ref().map(|query| {
let query_text =
util::truncate_and_trailoff(query.as_str(), MAX_TAB_TITLE_LEN);
let tab_name: Option<Cow<_>> = self
.model
.read(cx)
.search_history
.current()
.as_ref()
.map(|query| {
let query_text = util::truncate_and_trailoff(query, MAX_TAB_TITLE_LEN);
query_text.into()
});
Label::new(