zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 15:44:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Increase diagnostic editor's vertical scroll margin

Browse Source 
This way, the first path header will always be fully visible when
you move your cursor to the beginning of the multibuffer.
This commit is contained in:
Max Brunsfeld 2022-01-25 17:35:37 -08:00
parent 9b9fcf6927
commit 76bbd101c6
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/diagnostics/src/diagnostics.rs
View File

@ -146,8 +146,11 @@ impl ProjectDiagnosticsEditor {
let excerpts = cx.add_model(|cx| MultiBuffer::new(project.read(cx).replica_id()));
let build_settings = editor::settings_builder(excerpts.downgrade(), settings.clone());
let editor =
cx.add_view(|cx| Editor::for_buffer(excerpts.clone(), build_settings.clone(), cx));
let editor = cx.add_view(|cx| {
let mut editor = Editor::for_buffer(excerpts.clone(), build_settings.clone(), cx);
editor.set_vertical_scroll_margin(5, cx);
editor
});
cx.subscribe(&editor, |_, _, event, cx| cx.emit(*event))
.detach();

9
crates/editor/src/editor.rs
View File

@ -379,6 +379,7 @@ pub struct Editor {
blink_epoch: usize,
blinking_paused: bool,
mode: EditorMode,
vertical_scroll_margin: f32,
placeholder_text: Option<Arc<str>>,
highlighted_rows: Option<Range<u32>>,
nav_history: Option<ItemNavHistory>,
@ -518,6 +519,7 @@ impl Editor {
blink_epoch: 0,
blinking_paused: false,
mode: EditorMode::Full,
vertical_scroll_margin: 3.0,
placeholder_text: None,
highlighted_rows: None,
nav_history: None,
@ -591,6 +593,11 @@ impl Editor {
cx.notify();
}
pub fn set_vertical_scroll_margin(&mut self, margin_rows: usize, cx: &mut ViewContext<Self>) {
self.vertical_scroll_margin = margin_rows as f32;
cx.notify();
}
pub fn set_scroll_position(&mut self, scroll_position: Vector2F, cx: &mut ViewContext<Self>) {
let map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
@ -690,7 +697,7 @@ impl Editor {
match autoscroll {
Autoscroll::Fit | Autoscroll::Newest => {
let margin = margin.min(3.0);
let margin = margin.min(self.vertical_scroll_margin);
let target_top = (first_cursor_top - margin).max(0.0);
let target_bottom = last_cursor_bottom + margin;
let start_row = scroll_position.y();