yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix overlap (#10474)

Browse Source 
Although I liked the symmetry of the count in the middle of the arrows,
it's
tricky to make the buttons not occlude the count on hover, so go back to
this arrangement.

Release Notes:

- N/A
This commit is contained in:
Conrad Irwin authored and GitHub committed 2024-04-12 08:25:09 -06:00
1 parent faaf3219a6
commit d7020f686b
2 files changed
+21 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/search/src/buffer_search.rs
+10 -17
View File
@@ -272,28 +272,21 @@ impl Render for BufferSearchBar {
"Select previous match",
&SelectPrevMatch,
))
.when(!narrow_mode, |this| {
this.child(
h_flex()
.mx(rems_from_px(-4.0))
.min_w(rems_from_px(40.))
.justify_center()
.items_center()
.child(Label::new(match_text).color(
if self.active_match_index.is_some() {
Color::Default
} else {
Color::Disabled
},
)),
)
})
.child(render_nav_button(
ui::IconName::ChevronRight,
self.active_match_index.is_some(),
"Select next match",
&SelectNextMatch,
)),
))
.when(!narrow_mode, |this| {
this.child(h_flex().min_w(rems_from_px(40.)).child(
Label::new(match_text).color(if self.active_match_index.is_some() {
Color::Default
} else {
Color::Disabled
}),
))
}),
);
let replace_line = should_show_replace_input.then(|| {
crates/search/src/project_search.rs
+11 -14
View File
@@ -1437,20 +1437,6 @@ impl Render for ProjectSearchBar {
Tooltip::for_action("Go to previous match", &SelectPrevMatch, cx)
}),
)
.child(
h_flex()
.mx(rems_from_px(-4.0))
.min_w(rems_from_px(40.))
.justify_center()
.items_center()
.child(
Label::new(match_text).color(if search.active_match_index.is_some() {
Color::Default
} else {
Color::Disabled
}),
),
)
.child(
IconButton::new("project-search-next-match", IconName::ChevronRight)
.disabled(search.active_match_index.is_none())
@@ -1463,6 +1449,17 @@ impl Render for ProjectSearchBar {
}))
.tooltip(|cx| Tooltip::for_action("Go to next match", &SelectNextMatch, cx)),
)
.child(
h_flex()
.min_w(rems_from_px(40.))
.child(
Label::new(match_text).color(if search.active_match_index.is_some() {
Color::Default
} else {
Color::Disabled
}),
),
)
.when(limit_reached, |this| {
this.child(
div()