mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 02:48:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Center the selected item when updating outline query

Browse source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-01-14 17:53:06 +01:00
parent e4c0fc6ad5
commit ce51196eab
5 changed files with 54 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/file_finder/src/file_finder.rs
View file

@ -353,7 +353,8 @@ impl FileFinder {
let mat = &self.matches[selected_index]; let mat = &self.matches[selected_index];
self.selected = Some((mat.worktree_id, mat.path.clone())); self.selected = Some((mat.worktree_id, mat.path.clone()));
} }
self.list_state.scroll_to(selected_index); self.list_state
.scroll_to(ScrollTarget::Show(selected_index));
cx.notify(); cx.notify();
} }
@ -364,7 +365,8 @@ impl FileFinder {
let mat = &self.matches[selected_index]; let mat = &self.matches[selected_index];
self.selected = Some((mat.worktree_id, mat.path.clone())); self.selected = Some((mat.worktree_id, mat.path.clone()));
} }
self.list_state.scroll_to(selected_index); self.list_state
.scroll_to(ScrollTarget::Show(selected_index));
cx.notify(); cx.notify();
} }
@ -415,7 +417,8 @@ impl FileFinder {
} }
self.latest_search_query = query; self.latest_search_query = query;
self.latest_search_did_cancel = did_cancel; self.latest_search_did_cancel = did_cancel;
self.list_state.scroll_to(self.selected_index()); self.list_state
.scroll_to(ScrollTarget::Show(self.selected_index()));
cx.notify(); cx.notify();
} }
} }

41
crates/gpui/src/elements/uniform_list.rs
View file

@ -14,9 +14,14 @@ use std::{cmp, ops::Range, sync::Arc};
#[derive(Clone, Default)] #[derive(Clone, Default)]
pub struct UniformListState(Arc<Mutex<StateInner>>); pub struct UniformListState(Arc<Mutex<StateInner>>);
pub enum ScrollTarget {
Show(usize),
Center(usize),
}
impl UniformListState { impl UniformListState {
pub fn scroll_to(&self, item_ix: usize) { pub fn scroll_to(&self, scroll_to: ScrollTarget) {
self.0.lock().scroll_to = Some(item_ix); self.0.lock().scroll_to = Some(scroll_to);
} }
pub fn scroll_top(&self) -> f32 { pub fn scroll_top(&self) -> f32 {
@ -27,7 +32,7 @@ impl UniformListState {
#[derive(Default)] #[derive(Default)]
struct StateInner { struct StateInner {
scroll_top: f32, scroll_top: f32,
scroll_to: Option<usize>, scroll_to: Option<ScrollTarget>,
} }
pub struct LayoutState { pub struct LayoutState {
@ -97,14 +102,32 @@ where
state.scroll_top = scroll_max; state.scroll_top = scroll_max;
} }
if let Some(item_ix) = state.scroll_to.take() { if let Some(scroll_to) = state.scroll_to.take() {
let item_ix;
let center;
match scroll_to {
ScrollTarget::Show(ix) => {
item_ix = ix;
center = false;
}
ScrollTarget::Center(ix) => {
item_ix = ix;
center = true;
}
}
let item_top = self.padding_top + item_ix as f32 * item_height; let item_top = self.padding_top + item_ix as f32 * item_height;
let item_bottom = item_top + item_height; let item_bottom = item_top + item_height;
if center {
if item_top < state.scroll_top { let item_center = item_top + item_height / 2.;
state.scroll_top = item_top; state.scroll_top = (item_center - list_height / 2.).max(0.);
} else if item_bottom > (state.scroll_top + list_height) { } else {
state.scroll_top = item_bottom - list_height; let scroll_bottom = state.scroll_top + list_height;
if item_top < state.scroll_top {
state.scroll_top = item_top;
} else if item_bottom > scroll_bottom {
state.scroll_top = item_bottom - list_height;
}
} }
} }
} }

14
crates/outline/src/outline.rs
View file

@ -187,19 +187,23 @@ impl OutlineView {
fn select_prev(&mut self, _: &SelectPrev, cx: &mut ViewContext<Self>) { fn select_prev(&mut self, _: &SelectPrev, cx: &mut ViewContext<Self>) {
if self.selected_match_index > 0 { if self.selected_match_index > 0 {
self.select(self.selected_match_index - 1, true, cx); self.select(self.selected_match_index - 1, true, false, cx);
} }
} }
fn select_next(&mut self, _: &SelectNext, cx: &mut ViewContext<Self>) { fn select_next(&mut self, _: &SelectNext, cx: &mut ViewContext<Self>) {
if self.selected_match_index + 1 < self.matches.len() { if self.selected_match_index + 1 < self.matches.len() {
self.select(self.selected_match_index + 1, true, cx); self.select(self.selected_match_index + 1, true, false, cx);
} }
} }
fn select(&mut self, index: usize, navigate: bool, cx: &mut ViewContext<Self>) { fn select(&mut self, index: usize, navigate: bool, center: bool, cx: &mut ViewContext<Self>) {
self.selected_match_index = index; self.selected_match_index = index;
self.list_state.scroll_to(self.selected_match_index); self.list_state.scroll_to(if center {
ScrollTarget::Center(index)
} else {
ScrollTarget::Show(index)
});
if navigate { if navigate {
let selected_match = &self.matches[self.selected_match_index]; let selected_match = &self.matches[self.selected_match_index];
let outline_item = &self.outline.items[selected_match.candidate_id]; let outline_item = &self.outline.items[selected_match.candidate_id];
@ -319,7 +323,7 @@ impl OutlineView {
.unwrap_or(0); .unwrap_or(0);
navigate_to_selected_index = !self.matches.is_empty(); navigate_to_selected_index = !self.matches.is_empty();
} }
self.select(selected_index, navigate_to_selected_index, cx); self.select(selected_index, navigate_to_selected_index, true, cx);
} }
fn render_matches(&self) -> ElementBox { fn render_matches(&self) -> ElementBox {

6
crates/project_panel/src/project_panel.rs
View file

@ -1,8 +1,8 @@
use gpui::{ use gpui::{
action, action,
elements::{ elements::{
Align, ConstrainedBox, Empty, Flex, Label, MouseEventHandler, ParentElement, Svg, Align, ConstrainedBox, Empty, Flex, Label, MouseEventHandler, ParentElement, ScrollTarget,
UniformList, UniformListState, Svg, UniformList, UniformListState,
}, },
keymap::{ keymap::{
self, self,
@ -278,7 +278,7 @@ impl ProjectPanel {
fn autoscroll(&mut self) { fn autoscroll(&mut self) {
if let Some(selection) = self.selection { if let Some(selection) = self.selection {
self.list.scroll_to(selection.index); self.list.scroll_to(ScrollTarget::Show(selection.index));
} }
} }

6
crates/theme_selector/src/theme_selector.rs
View file

@ -140,7 +140,8 @@ impl ThemeSelector {
if self.selected_index > 0 { if self.selected_index > 0 {
self.selected_index -= 1; self.selected_index -= 1;
} }
self.list_state.scroll_to(self.selected_index); self.list_state
.scroll_to(ScrollTarget::Show(self.selected_index));
cx.notify(); cx.notify();
} }
@ -148,7 +149,8 @@ impl ThemeSelector {
if self.selected_index + 1 < self.matches.len() { if self.selected_index + 1 < self.matches.len() {
self.selected_index += 1; self.selected_index += 1;
} }
self.list_state.scroll_to(self.selected_index); self.list_state
.scroll_to(ScrollTarget::Show(self.selected_index));
cx.notify(); cx.notify();
} }