oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Autoscroll when leader moves cursors

Browse Source 
instead of copying their scroll top.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld
2022-03-22 18:02:54 -07:00
co-authored by Nathan Sobo
parent fad299eb3f
commit fa62fd968f
2 changed files with 74 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/editor/src/items.rs
+14 -13
View File
@@ -166,19 +166,6 @@ impl FollowableItem for Editor {
let excerpt_id = excerpt_id.clone();
drop(buffer);
if let Some(anchor) = message.scroll_top_anchor {
self.set_scroll_top_anchor(
Anchor {
buffer_id: Some(buffer_id),
excerpt_id: excerpt_id.clone(),
text_anchor: language::proto::deserialize_anchor(anchor)
.ok_or_else(|| anyhow!("invalid scroll top"))?,
},
vec2f(message.scroll_x, message.scroll_y),
cx,
);
}
let selections = message
.selections
.into_iter()
@@ -188,6 +175,20 @@ impl FollowableItem for Editor {
.collect::<Vec<_>>();
if !selections.is_empty() {
self.set_selections(selections.into(), None, false, cx);
self.request_autoscroll_remotely(Autoscroll::Newest, cx);
} else {
if let Some(anchor) = message.scroll_top_anchor {
self.set_scroll_top_anchor(
Anchor {
buffer_id: Some(buffer_id),
excerpt_id: excerpt_id.clone(),
text_anchor: language::proto::deserialize_anchor(anchor)
.ok_or_else(|| anyhow!("invalid scroll top"))?,
},
vec2f(message.scroll_x, message.scroll_y),
cx,
);
}
}
}
}