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

Fix coloring of local selections when following

Browse source 
Co-authored-by: Conrad <conrad@zed.dev>
This commit is contained in:
Max Brunsfeld 2023-09-28 11:37:44 -07:00
parent 0f39b63801
commit 0c95e5a6ca
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/editor/src/element.rs
View file

@ -2250,6 +2250,21 @@ impl Element<Editor> for EditorElement {
} }
if let Some(collaboration_hub) = &editor.collaboration_hub { if let Some(collaboration_hub) = &editor.collaboration_hub {
// When following someone, render the local selections in their color.
if let Some(leader_id) = editor.leader_peer_id {
if let Some(collaborator) = collaboration_hub.collaborators(cx).get(&leader_id) {
if let Some(participant_index) = collaboration_hub
.user_participant_indices(cx)
.get(&collaborator.user_id)
{
if let Some((local_selection_style, _)) = selections.first_mut() {
*local_selection_style =
style.selection_style_for_room_participant(participant_index.0);
}
}
}
}
let mut remote_selections = HashMap::default(); let mut remote_selections = HashMap::default();
for selection in snapshot.remote_selections_in_range( for selection in snapshot.remote_selections_in_range(
&(start_anchor..end_anchor), &(start_anchor..end_anchor),
@ -2262,11 +2277,9 @@ impl Element<Editor> for EditorElement {
style.absent_selection style.absent_selection
}; };
// The local selections match the leader's selections. // Don't re-render the leader's selections, since the local selections
// match theirs.
if Some(selection.peer_id) == editor.leader_peer_id { if Some(selection.peer_id) == editor.leader_peer_id {
if let Some((local_selection_style, _)) = selections.first_mut() {
*local_selection_style = selection_style;
}
continue; continue;
} }